Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(simapp): do not create data dir at each run (backport #17240) #17275

Merged
merged 2 commits into from
Aug 3, 2023
Merged

fix(simapp): do not create data dir at each run (backport #17240) #17275

merged 2 commits into from
Aug 3, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 3, 2023

This is an automatic backport of pull request #17240 done by Mergify.
Cherry-pick of b61f611 has failed:

On branch mergify/bp/release/v0.50.x/pr-17240
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit b61f611f0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   simapp/simd/cmd/commands.go
	renamed:    simapp/simd/cmd/cmd_test.go -> simapp/simd/cmd/root_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   simapp/simd/cmd/root.go
	both modified:   simapp/simd/cmd/root_v2.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@julienrbrt @mergify
fix(simapp): do not create data dir at each run (#17240)
bf5472f 
(cherry picked from commit b61f611)

# Conflicts:
#	simapp/simd/cmd/root.go
#	simapp/simd/cmd/root_v2.go
@mergify mergify bot requested a review from a team as a code owner August 3, 2023 12:46
@mergify mergify bot added the conflicts label Aug 3, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 2023

@mergify[bot] your pull request is missing a changelog!

@julienrbrt julienrbrt self-assigned this Aug 3, 2023
@julienrbrt julienrbrt removed their assignment Aug 3, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) August 3, 2023 12:55
@julienrbrt julienrbrt merged commit 8375a67 into release/v0.50.x Aug 3, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17240 branch August 3, 2023 13:35
@faddat faddat mentioned this pull request Nov 8, 2024
Closed
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julienrbrt julienrbrt julienrbrt approved these changes

@alexanderbez alexanderbez Awaiting requested review from alexanderbez

@atheeshp atheeshp Awaiting requested review from atheeshp

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@julienrbrt